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

m->d