Minor bugfix 2.
Minor bugfix 3.
Merge pull request #5 from ArkadyL/master

Minor bugfixes.