Merge pull request #1 from coffeered/master

change button & select