merged gh-8 with master
Changed way the tunnels were being removed.

Fixes #8. Bump to 1.0.4