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

Minor bug fixes.