[PR] 1.7.1 review

Fixes #5