fixed 11,fixed 8
Merge branch 'develop'