Modified makefile
Reimport library structure
Updated Makefile
Merge branch 'master' into gh-pages