Merge pull request #73 from LeFroid/Rel19

[Core] Final merge of changes
[Core] Fixed a small typo
Merge branch 'Rel19' of https://github.com/LeFroid/server into Rel19