Merge pull request #5 from Petrofski/development

Development
merge
Merge pull request #6 from Petrofski/tamo

Tamo