Merge branch 'develop'
Fixed a bug in normalize()