Merge pull request #48 from ChrisBoesch/master

update