2.1.3

- Refactored code
- Fix for Shield TV devices