Code review
Merge pull request #1 from reload/master

Code review