fix init()
Merge branch 'develop'