Merging 08/21/2014

**Merge commits** with *iSC Host* :smile:

-[**Suriyaa Kudo**](https://github.com/SuriyaaKudoIsc) :octocat: