Merge pull request #21 from ChrisBoesch/master

update