Android fix
Merge pull request #21 from expyriment/developing

Android fix