Few updates
Merge branch 'master' of https://github.com/apryet/py2s