merge pull request #1 from rdemaria