Merge pull request #5 from changran52m/master

fix some bug
fix some button bugs
Merge pull request #13 from frankmu/master

fix some button bugs