v2.0.5

Code refactoring in '/plugin/*', '/utils/*';