enolgor Fix #14 with changes made from hobulian