Merge pull request #21 from aaronmjacobs/master