updated to work with android studio 0.8.1