Merge pull request #79 from asciidisco/androidesn