Matejs changes
Merge pull request #1 from JanisMancevics/Matejs

Matejs changes