some bugs removed
some bugs removed
Merge remote-tracking branch 'origin/master'