Dev issue 37

Also takes care of https://github.com/RedCardDev/KickShotAndroid/pull/40