Merge pull request #16 from lexwebb/master

Rebase
Merge pull request #20 from lexwebb/CollapsingTunnels

Merge pull request #16 from lexwebb/master