Merge pull request #1 from L2J/ertheia

Ertheia