Updated and cleaned, added example plugin class/module