Merge pull request #1 from NormantasKudzma/nkbranch

Merge into master
stuff
Minor changes v2