Closes bug #131 from Sebastian