debug
Merge pull request #20 from 54wang17/development

debug