Minor updates.
Merge pull request #30 from izhbannikov/dev

Minor updates.