Release 2.0

Fixes #44, #30, #36, #48, #46