Implements #99 and fixes #134
In order to develop this on the latest Android Studio release, I had to update gradle. Unfortunately, this seems to have broken the CI, and I was unsuccessful in fixing it :(