Merge pull request #50 from ChrisBoesch/master

update