Merge pull request #22 from ChrisBoesch/master

update