merge fix
Merge pull request #51 from kexline4710/merge_fix

merge fix