little refactoring
Merge remote-tracking branch 'origin/BugHunt'