Corrected a data-default-src in readme
Small code readability refactoring
Added a function to DRY code + Vars and functions names refactoring
Merge branch 'master' into gh-pages