Revert "Merge"
Merge pull request #118 from acidvertigo/revert-117-patch-21

Revert "Merge"