Merge pull request #354 from gvz/master