Fix #252
Merge pull request #253 from eryx/master

Fix #252