Merge remote-tracking branch 'upstream/master'
Merge pull request #41 from mubassirhayat/master

Merge remote-tracking branch 'upstream/master'