Fix for #163
Merge pull request #171 from PonteIneptique/issue-163

Fix for #163