Updated to 0.9.6.1 bugfixes