Revert "Merge"
Merge pull request #2 from Isoterik/revert-1-merge

Revert "Merge"