Release 2.1. Fixes #2 Fixes #4 Fixes #7