wiki update & code sync
wiki sync
Merge pull request #5 from lookof/develop

Develop