Quick fixing a production bug occuring when upgrading
Merge branch 'cantina' into dev
Bumping version number
Merge branch 'dev'. New version, 2.0.2