finish , i think
Merge pull request #5 from nodik/dev-part-2

finish , i think