todo: fix ie 8
Merge remote-tracking branch 'remotes/origin/zengarden-newbranch'