Fixed:
    test and fixed bugs over
Merge remote-tracking branch 'origin/master'