Merge pull request #1 from hukal/master

Added android part
- removed unnecessary code
Merge pull request #1 from ttatarinov/master

Sync with main repo