Merge branch 'master' of https://github.com/federman/s
Merge branch 'master' of github.com:federman/s