fix bug and ignore short fling.
Merge remote-tracking branch 'origin/master'