bug fixes for release 0.0.5