Adding tap support
Merge pull request #13 from hybridgroup/tap-support

Adding tap support