Merge pull request #1 from jsarenik/fixes

Fixes