Makefile
Fixed new string format
Removed flexo/pointer
Merge branch 'master' into gh-pages