Submitted by: claudiu vasadi <claudiu.vasadi@gmail.com> Patch by: Glen Barber <glen.j.barber@gmail.com>