Two bug fixes. About to create a new version (0.0.5)