ADDED: recent changes and better algorith for plot
Merge branch 'master' of https://github.com/ganddev/MAPH