Merge pull request #44 from ChrisBoesch/master

update