A few changes to in
Merge branch 'master' of https://github.com/sainsb/allegro
Much is the change