New entry names
Merge pull request #36 from Vexatos/master

New entry names