Merge pull request #332 from cduclos/master

Fix for 1804