Update 20141209
Merge pull request #1 from haoranyu/1209

Update 20141209