now using android studio
merged