fix
Merge pull request #2 from nicholasxjy/dev

fix