updated to work with iframes
Merge branch 'master' of github.com:populr/scribe