Fixes #13   .... and more flexible android checks