Improve after review
Merge pull request #34 from bem/improve

Improve after review