Merge pull request #1 from Nzbuu/master

Corrections
Fix WALDM's short name
Merge pull request #2 from waldm/patch-1

Fix WALDM's short name