some stuff
some changes
resolved conflicts
Merge pull request #27 from SergeyAbadzhev/NewBranch

some stuff