Big Update
Merge pull request #3 from faisalr/master

Big Update