Version 0.1.1

Bugfixing and improvements