MPNG 3.1.5-r2 with Mike's Changes