edit
Merge remote-tracking branch 'upstream/master'
Merge pull request #55 from dev2geek/master

disable feedback time