add align
Merge branch 'develop'