Merge pull request #41 from ChrisBoesch/master

update