Upgrading to version 0.9.6