Issue 151

Should be tested with SCION.