Made some bug fixes
Prepared to release 0.0.36.