A couple of fixes

Tasty opera! : )
Merge pull request #81 from yoksel/patch-1

A couple of fixes