Merge pull request #42 from ChrisBoesch/master

update