Fixing errors
Merge pull request #47 from azotova/master

Fixing errors