Stupid l
Merge pull request #401 from josenavas/issue398

Fixes issue #398