Merge pull request #40 from ChrisBoesch/master

update