Fix for #235
Merge pull request #253 from idhamperdameian/master

(id) Fix for #235