Merge branch 'master' of https://github.com/avdata99/junar-compatible-webservice