#670 Updated build script to include small jar from proguard
#1151 Code review updates