Merge pull request #23 from ChrisBoesch/master

update