Merge pull request #1 from L2J/master

Sync