Merge pull request #52 from ChrisBoesch/master

update