Merge pull request #2 from rkerr/master

Joomla 3.x support and 2.5 version update