#2
Merge remote-tracking branch 'origin/master'
changes hit buffer size to 50ms