Plugin version 1.6.1.0 merged to master branch