Updated plugin classes to utilize inheritance instead of passing one as a parameter to the other.
Updated some comment notes about extending the Options class
Merge branch 'release/2.0.1'