Upped to v0.7.1
Fixed #21
Fixed #24