Small tweaks
Merge pull request #2 from sbaydakov/master

Small tweaks