Finish 1.0-rc5
Refactoring
OVERRIDE macros deprecated
Plugin version incremented
Finish 1.1-rc6