Merge pull request #7 from omarmjhd/master

Updating to latest version of master