Make it work on Android phones
Merge pull request #10 from JMPerez/upstream

Make it work on Android phones