#7 - Filehsoting - small corrections
Merge branch 'hotfix/#7_-_Filehosting_-_Corrections' into gh-pages