fix for #211
Merge pull request #252 from islamoc/master

Fix  #211