Merge pull request #43 from mubassirhayat/master

All together