Merge pull request #46 from ChrisBoesch/master

update