added some fixes
Merge pull request #11 from olegshegula/olegsbranch

added some fixes