Closes #175
Merge pull request #180 from lainventoria/feature/fix-175

Closes #175