Fixes #214
Merge pull request #215 from kamilwaz/master

Fixes #214