fixes

sort of
Merge branch 'master' of https://github.com/Z001/pypuush

Conflicts:
	1.py