fix button
Merge branch 'master' into credit
Merge pull request #100 from nairys/credit

Credit