Adding tap option + fixing Android tap bug (#83)