Trying to take iframes into account

Please give it a try, it works (or at least it seems to :innocent: ) with our setup, but testing is always welcome! ;D