Merge pull request #25 from ChrisBoesch/master

update