Merge pull request #20 from ChrisBoesch/master

update