Version 2.1 released!

Merging new features and bug fixes to the master.