Fixed gradle errors
Merge branch 'beta' into developing
Additional fix for #199