This solved issue #140 for me.
Merge pull request #307 from ZehCastro/master

This solved issue #140 for me.