Merge pull request #5 from mchishti/feature1

f1 N
Merge pull request #6 from mchishti/feature1

Feature1
ah
ok f2
Merge pull request #7 from mchishti/feature2

ok f2