Merge pull request #45 from ChrisBoesch/master

update