Last commit before merger

Signed-off-by: Ken Arroyo Ohori <g.a.k.arroyoohori@tudelft.nl>