version 2.0
something not important
fix some bugs
Merge branch 'develop'