Merge pull request #268 from elkuku/joomla