Merge pull request #21 from aschnell/master