close #124
Merge branch 'develop' into Release02

* develop:
  close #124