Merge pull request #1 from JoomliC/master

re