0.9.4

Cloning 0.9.4 branch