Separate ie7 compatible version
Merge