LPS-30124

Hey Julio,

Finally i had time to work on this, sorry for being so late.

Regards,
Levi