Merge pull request #525 from ilmente/master