Minor improvements.
Merge pull request #36 from izhbannikov/dev

Minor improvements.