Minor fixes after compiling in monodevelop on Ubuntu for the first time
Release 2.0.1
Merge branch 'master' into develop