edit dev
Merge pull request #3 from mmitrik/feature

edit dev