fix some bug
Merge pull request #1 from ktmt/source

fix some bug