Minor bug fixes.
Merge pull request #25 from izhbannikov/dev

Minor bug fixes.