Fixed bug with loading fonts
Cleaning up in project
Merge branch 'master' into gh-pages