Code review
Merge pull request #3 from davidbgk/master

Code review