Work from Android
Merge pull request #12 from aelien27/work_from_android

Work from Android