bug fix
Merge pull request #1 from itouch2/master

bug fix