Android 5.0 Lollipop compatibility
Merge pull request #21 from marcogagino-22/master

Android 5.0 Lollipop compatibility