change some code
getIgnore
Merge branch 'Ji'