fixes things
Merge pull request #1 from peterbe/upgrade-branch

fixes things