Modified library for android problem. Working, but there are still few things to do.