v2.1

Closes #236, #237