Plug-in module implemented - closes #21