Issue 85

Works with SCION branch issue-85.
PR here: https://github.com/jbeard4/SCION/pull/169