Merged in yanniss/doop-nexgen (pull request #15)
Bug fix
Changes to avoid inclusion of android logic when redundant
Bug fix
Changes to avoid inclusion of android logic when redundant