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

Minor improvements.