Fifo ++
Merge branch 'master' of https://github.com/Alex-D/Comanche