Closes https://github.com/awesomeWM/awesome/pull/330.
Closes https://github.com/awesomeWM/awesome/pull/321.
Signed-off-b: Julian Wollrath <jwollrath@web.de>