Review, pass 1
Merge pull request #3 from rail/review1

Review, pass 1