Code review, see #2, search for //REVIEW to see comments.
Merge remote-tracking branch 'origin/master'