Review #1.
Merge pull request #1 from Alexpux/master

Review #1.