Merge "S'mores" into master

I suggest merging the Dev branch into the master for the release of v2.1 "S'mores", v1.0 is dead.