U4ID: combine tunnel declaration into add command
Merge pull request #5 from cjdoucette/u4id

U4ID: combine tunnel declaration into add command