[develop]

- More new features added
[develop]

- fixed some bugs
Merge branch 'develop'