fixed #32, #33, #34, #35
Merge branch 'master' of https://github.com/johnlife/Glimpse-Android.git