added tap option, 0.0.4.1