Merge pull request #21 from DSciDev/master

Merge pull request #20 from DSciDev/google_docs_iframe
Merge pull request #22 from DSciDev/google_docs_iframe

Merge pull request #21 from DSciDev/master