Merge pull request #8 from omarmjhd/dev

Merge pull request #7 from omarmjhd/master