Merge pull request #10 from ChrisBoesch/master

update