More stuff
Cleanup
Bump version 0.1.5