Merge pull request #48 from Magenic/master

merging into my local branch
Fixing issue related to compatibility mode for intranet sites.
Merge pull request #195 from jwendl/master

Fixing compat issues.