merge of plugin2 to branch of master