Update including path to relative in test
Update Makefile
Merge branch 'master' into gh-pages
Update