Code cleanup; added support for android environments
Updated bin files