Merge pull request #25 from IRelaxxx/Alex-Dev

Alex dev
NewButtonsAdded
Merge pull request #26 from IRelaxxx/Gustav-Dev

Gustav dev