Release of version 2.0

Taking beta-version-2 out of beta and releasing it into the master.