Merge pull request #1 from christou/master

new contente origin/master'.
Merge pull request #2 from christou/gh-pages

Merge pull request #1 from christou/master