The answer to everything
Merge branch 'thomas' of https://github.com/Ortix92/Wieklikt into development