Bugfixes and improvements
1.0.13