Fixed inconsistencies and bumped to v0.0.5