Merging 08/13/2014

**Merge commits** from [*iSC Velocity*](https://github.com/iSCVelocity/velocity.isc) with [*iSC Host*](https://github.com/iSC-Host/velocity.isc). :smiley:

-[**Suriyaa Kudo**](https://github.com/SuriyaaKudoIsc) :octocat: