Merge pull request #32 from Vdimir/master

some small improves
fixed bug with duplicating