Merge pull request #39 from nromanen/master

m->d
validation&design
some bugs fixed jan15
fixed bugs
after merge dmitry->master