few changes
Merge pull request #1 from sunnyLA4/work

few changes