Fixed weird button message bug
Merge pull request #1 from imthexie/michael_develop

Fixed weird button message bug