Merge pull request #763 from brooksryba/develop

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

Develop