clean up, fixes #6, fixes #4, bump to v1.5.0-SNAPSHOT
partly fixes #7