Merge pull request #1 from Pweb-fpuna/master2

Master2
Merge pull request #7 from roy2406/master2

Merge pull request #1 from Pweb-fpuna/master2