Merge pull request #197 from NiLuJe/master

Kill one Android FIXME...