Merging 07/23/2014

Merge :couple: *dev* and *master*. :smile:

-**[Suriyaa Kudo](https://github.com/SuriyaaKudoIsc)**