Further simplification
Merge branch 'wip' of github.com:miniboxing/miniboxing-plugin into wip