This version is on jitpack instead of jcenter (cherry picked from commit 7d23fd8ef5bbb9efd12f65bb5c9670464dd6c0b1)