Merge pull request #5 from ChrisBoesch/master

update