add meta + fix makefile
Merge branch 'master' into opam-packaged