Merge pull request #1 from krdyke/rewrite

Rewrite
Merge remote-tracking branch 'upstream/master'
Merge pull request #6 from borchert/master

merge