Master

Open petar_miladinovic requested to merge petar_miladinovic/fork:master into master