cleaning up
Merge branch 'devel' of https://github.com/FilipeMaia/owl into benedikt

Conflicts:
	owl.py