Merging with gh-pages branch:
- please, look for the commits history at gh-pages branch.