Fix for bug #1 and bug #3
Fix for android lint errors