Version 2.0 final

This is the final code for version 2.0 of the plugin