Merge pull request #9 from ChrisBoesch/master

update