Update doc
Merge branch 'develop'

* develop:
  Update doc

Conflicts:
	README.markdown