Update and clean the code.
Merge branch 'develop'