Update to version 2.0.3
fix merge error
Merge branch 'master' into tgates/work

* master:
  Update to version 2.0.3