Revert "importing changes to fork"
Merge pull request #2 from GitMonkey007/revert-1-master

Revert "importing changes to fork"