Fixes, releasing as version 0.0.5