bugfixes after refactoring
try to fix IFrame size issues. Ref #221
Merge master
Merge pull request #236 from InnovaLangues/merge-master

Merge master