Merge pull request #391 from dguglielmi/master