Merge pull request #1 from Loghor/Loghor

Loghor