Fixes #54
Merge pull request #60 from mauhiz/feature/fix54

Fixes #54