Merge branch 'minor-features' into patch-ie-patches-fix
Fixes for better ie support
Merge branch 'patch-ie-patches-fix'
Fixes npm install bug and reintroduces conditional comments