Rewrite
Merge pull request #97 from kevva/refactor

Rewrite