Merge pull request #24 from ChrisBoesch/master

update