Fix proguard
Bump macroid version