fix issue #7: if crossDomain is set to false, it can be overriden.
Merge branch 'hotfix/#7'