Android compability

- Bug fix
- New Windows