bug revise
Merge branch 'develop'

alpha 1.0 version bug revise