Fixed:
    make the code better
Merge remote-tracking branch 'origin/master'