Fixing some merge conflicts with v.2.0.0
Merge branch 'master' into v.0.2.0