Minor refactoring
Update to v0.0.5