Updated to Android 5.0.1 - API 21.
Some minor modifications in the code.