Removed bitwize AND
Added overrun counter to fifo
Merge branch 'testing'