[ISSUE_1] Fixed a huge bug
Merge branches 'ISSUE_1' and 'master'