be able to work in Android
Merge branch 'book'