Better backwards compatibility to Android API 8
Merge pull request #5 from marcow/master

Backwards compatibility to Android API level 8