- Moved methods to the top #746 
- Solved part of Android problem when invoking the keyboard #145