Fix #212
Merge pull request #215 from willyaranda/issue/212

Fix #212