fixed bugs in __main__ of manipulator
Merge branch 'history' of https://github.com/dporro/spaghetti into history