Pushing new changes
Merge branch 'master' into pull_shilin-he_20140327135009358
Updated