Issue 137 and 138
Created by: feyzo
Should be tested with scion-core https://github.com/jbeard4/SCION-CORE/tree/issue-138
Closes #138 (closed)
Created by: feyzo
Should be tested with scion-core https://github.com/jbeard4/SCION-CORE/tree/issue-138
Closes #138 (closed)