minor changes
Merge branch 'develop'

* develop:
  minor changes
minor changes