added support for 5.0.4 (Android)