Complete re-write
Merge pull request #10 from coolAlias/patch-10

Complete re-write