Feature/support buttons

Fixes #2