Changes from Momchil

swag
Merge branch 'master' of https://github.com/fristys/FristysRepo