Unfinished changes, but pull needed.
Merge branch 'master' of https://github.com/dunadanpd/Wol
Disambiguation modified.
Bug fixes.
Merge remote-tracking branch 'origin/master'