Version 2.1

Fixes #328
Fixes #329
Fixes #214
Fixes #251
Fixes #320
Fixes #270
Fixes #311
Fixes #292
Fixes #297
Fixes #326
Fixes #280
Fixes #242
Fixes #286
Fixes #248
Fixes #236
Fixes #231
Fixes #220