Fixes
Merge pull request #3 from Eugeny/master

Fixes