Fixes #30
Merge pull request #33 from Sjeanpierre/new_change_button

Fixes #30