Fix IE issues
Merge pull request #319 from jerv13/master

Fix IE issues
Merge remote-tracking branch 'upstream/master' into sandbox