Fixing #232
Merge pull request #818 from euantorano/featurefix-232

Fixing #232