Merge pull request #3 from keepcalm444/rewrite

Rewrite