Merge pull request #24 from charlierudolph/master