Removed buggy animation on issue_6, will fix at issue_8
Merge branch 'dev_1.0' into issue_6
Merge branch 'issue_6' into dev_1.0