jasonsantos Merge pull request #7 from hishamhm/master