Merge pull request #89 from ampatalas/android

MYGUIDE-335 part 1