add some development things
merge master to develop
Merge pull request #1 from wintlu/develop

Develop