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

Minor updates.