added better support for android and other file types