Fixes
Merge pull request #1 from rvasilenko/fixes

Fixes