Upgrade to version 2.01
Fix installation on ubuntu
Merge branch 'upgrade_201'