add feature
edit conflict
fixed bug in ie6