Merge pull request #20 from tassiahmed/working

Working