Fixing #77
Merge pull request #78 from ermauliks/master

Fixing #77