Update plus script fixes.
Merge pull request #108 from tobie/2014-06-30-update

Update plus script fixes.