Merge pull request #747 from Arantor/release-2.1

! Core features is getting slimmer all the time, and the other areas hav...