Merge pull request #2 from ChrisBoesch/master

update