Final touches for 2.1.0

Closes #20