clean Makefile, add support function
Merge branch 'master' of https://github.com/metapolator/metapolator