Merge branch 'master' of https://github.com/naxd1532/avikonor.git