Merge pull request #40 from mubassirhayat/master

Merge Resolved