Merge pull request #90 from jitlogic/dev1

Dev1
Merge pull request #91 from jitlogic/dev1

Dev1
Prepare 0.9.6 release.