Closes #16. Android fixes.