Cleanup
Bugfix
Compiler plugin added