Feature/9695860

This is a pull request to implement this -> http://www.saurik.com/id/18