Merge pull request #217 from PhilLab:androidDocFix