Update Android-part by KimYoungSoo (http://github.com/KimYoungSoo)