Merge pull request #54 from nromanen/master

Merge m->k
use picker
before merge 10-01
Merge pull request #56 from nromanen/krivorotenko

Merge k->m