Merge pull request #435 from rogerpueyo/bmx6-graph-tunnels