Merge pull request #38 from ChrisBoesch/master

update