add android support
minor bug fix