fixed issues #32 and #33, new android package