minor fixes
removed space :)
Merge branch 'nico'
Merge branch 'master' of https://github.com/igsor/PuPy

Conflicts:
	PuPy/control.py