Merge pull request #1 from Ecosmob/master

Rebase with Master
Test2 Added: