Merge pull request #1 from ChrisBoesch/master

update