worked on #7, moved to v0.1.1