Rewrite
Merge pull request #1 from sander1/master

Rewrite