Added features and bugs for 0.9.5 release.