#25 Avoid general script to function within iFrames
Merge remote-tracking branch 'origin/master'