Changes made by Jakob Carlbring Alm (jakob.c.alm@gmail.com).