rewrite
Merge pull request #4 from mikedm139/master

Rewrite