Bug fixes, version 1.0.0.1