Fix android implemenation typos
Add windows implementation