Partial fixes for IE11 compatibility
Merge pull request #251 from chanon/ie-fix-1

Partial fixes for IE11 compatibility