Merge Refactored Plugin back to Master