Merge 2014/08/27

Merge *gh-pages* with *master*!

[**Suriyaa Kudo**](https://github.com/SuriyaaKudoIsc) :octocat: