Add minor fixes
Merge pull request #1 from ildarsafin/add-minor-fixes

Add minor fixes