Revert "Merge changes from master"
Merge pull request #2 from vptheron/revert-1-master

Revert "Merge changes from master"