build modification and documentation
Merge branch 'develop'

* develop:
  build modification and documentation