Merge pull request #29 from ChrisBoesch/master

update