Upgrade from manual changes
Merge pull request #7 from ronsn/issue5-first-plugin

Upgrade from manual changes