Fix #33
Merge pull request #34 from loladiro/kf/33

Fix #33