bug fix: Uncaught SecurityError Blocked a frame with origin
bug fix: cleanup
bug fix: same origin policy issue
Merge pull request #1614 from stevewithington/develop

bug fix: Uncaught SecurityError Blocked a frame with origin