Fix for issue n. 718
Merge pull request #780 from cc-rock/master

Fix for issue n. 718