Finished rewrite
Merge branch 'master' of https://github.com/jackcook/aplo