ENH
Merge branch 'master' of https://github.com/zagl/of23x
Rearranged libs