Overhauled the whole thing
Merge pull request #2 from sarteleb/patch-2

Overhauled the whole thing