small enhancements
Merge pull request #53 from ya-popeye/feature/small_enhancements

small enhancements