Fixing bugs
Merge pull request #134 from nmpetkov/patch-41

Fixing bugs