Merge pull request #714 from sescandell/master

FIX issue #641