Fixed a bug
Reverted some of the changes
Merge pull request #48 from DariusIII/dev

Reverted some of the changes