Minor changes and bugfixes
0.9.6