v2.0a

Trying to use proguard to shrink code