Merge pull request #3 from XOOPS/master

Merge fork from main branch