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

m->k