Merge pull request #33 from ChrisBoesch/master

update