merge
merge
fix checkstyle
Merge pull request #62 from nromanen/master

m->e