Rewrite...
Merge pull request #1 from elder-cb/master

Rewrite...