Make resources relative
Get rid of redundant message
Merge branch 'master' into gh-pages