Fix some errors
Merge pull request #23 from GerganaPetrova/master

Fix some errors