Merge pull request #46 from nromanen/master

Merge
8-01-13
1111
Merge pull request #47 from nromanen/krivorotenko

Merge k->m