Merge pull request #2 from kkralj1/master

Merge pull request #1 from kkralj1/feature/feature-add-some-buttons