fix for issue raised in https://github.com/waterbearlang/waterbear/issues/454#issuecomment-33188036
Merge pull request #498 from waterbearlang/454_broken_iframe

fix for issue raised in https://github.com/waterbearlang/waterbear/issue...
fix merge conflict
fixing merge conflict