Improve opener
Merge pull request #1361 from tomaszdurka/issue-1361

Improve opener plugin