Commit before merge.
Merge branch 'master' of https://github.com/dunadanpd/Wol
Indices optimization and bug fixes.