Merged PR from mallzee + fixed Android