added tap support
7 files changed