Added aqeel's changes.
Merge pull request #49 from maxluzuriaga/aqeels-changes

Aqeel's changes