Updated plugin and feature support.
Merge pull request #12 from mrbcuda/patch-1

Updated plugin and feature support.