Merge pull request #34 from ChrisBoesch/master

update