Merge branch 'master' and appropriate needed fixes of https://github.com/priyanjitdey94/plugin-GUI into development