Merge pull request #54 from ChrisBoesch/master

update