The code works for java, but needs to be really reworked for android

Will use the changlog stuff to figure it out....

Signed-off-by: Exikle <dixondcunha@hotmail.com>