fixed upstream errors from my own stupidity
Merge branch 'master' of https://github.com/federman/s