Merge pull request #10 from AccelerationNet/tap