Feature/plugin option

For #4