Merge pull request #3 from swat-web/gh-pages

++
++
++
++
++
++
++
++
++
Merge pull request #15 from bizimakin/gh-pages

++