v2.1

Closes #237