Merge pull request #35 from ChrisBoesch/master

update