Merge of version 2.0.5

Less verbose
Minor bugfixes.