Minor bugs fixes.
Merge pull request #29 from izhbannikov/dev

Minor bug fixes.