Merge branch 'master' into develop

* master:
Fix wrong options
Update file sums
Merge branch 'release/2.0.0b'

* release/2.0.0b:
  Update file sums
  Fix wrong options