Release 2 (almost done)

Contains many features and fixes.