If we include the files we may actually fix #18
Merge branch 'master' into gh-pages