opera-related fixes
Merge pull request #28 from ondras/master

opera-related fixes