Merge pull request #51 from ChrisBoesch/master

update