Multiple bugfixes and improvements.
v0.1.1