Fix for compatibility with 2.x devices

Hi,
I've implemented a couple general fixes to maintain compatibility with android 2.x devices.
Would love to see this merged into the main branch.
Oh, and meanwhile, good job with the material design update!

Regards.