Merge pull request #1 from paazmaya/master

Pull req.