Remove spaces in generated Makefile
Safer marshalling code
Add a way to compile the project for OCaml 4.02
Update .merlin file
Update opam file