replace_repeated_code
fix_empty_entry_issue
Merge pull request #3 from Xuefeng-Zhu/master

Replace repeated code with one function and bug fix