corrected merge conflicts
Merge pull request #23 from dmitryjum/master

corrected merge conflicts