two small issues
Merge pull request #12 from ishe-ua/master

two small issues