Fix #36
Merge pull request #37 from unikum/master

Fix #36