Matteo Corti <matteo.corti@id.ethz.ch>

Thanks to:
- Maarten Bremer for the useful suggestions
- Greg Vickers for pointing out incompatibilities with ePN
