Dealign with some oddities...
Merge branch 'master' of https://github.com/frqnck/apix