General updates
Merge branch 'master' into ie8-support
Add better type scaling
Merge branch 'master' into ie8-support