Weirich review
revise author
Merge pull request #19 from djdarkbeat/master

Weirich review