plugin stuffs
merege
Merge pull request #764 from Tendrid/develop

Develop