lastest changes
Merge pull request #4 from nodik/dev-part-2

lastest changes