Fix bugs.
Merge branch 'develop'