Review.
Merge pull request #3 from Hywan/review

Review