Merge pull request #11 from ChrisBoesch/master

update