Merge pull request #2 from FlackAP/master

Merge pull request #1 from FlackAP/gh-pages
Merge pull request #3 from FlackAP/gh-pages

Merge pull request #2 from FlackAP/master