Merge pull request #7 from ChrisBoesch/master

update