Merge pull request #47 from ChrisBoesch/master

update