Merge pull request #47 from kuu/master

Solved some Button degradation issues.