fix #12 and #9
Merge pull request #13 from BBCVisualJournalism/browserfix

fix #12 and #9