Modified version to alfa :)
Merge branch 'master' into gh-pages
Deployed alfa version