Fix bug for Android 2.3. Relative issues: #11 , #15