Merge pull request #3 from ChrisBoesch/master

update