Rewrite it completely
Merge pull request #4 from s-mage/rewrite

Rewrite it completely