Minor big fixes.
Merge pull request #26 from izhbannikov/dev

Minor big fixes.