Updated fork from Kal's master repo

Signed-off-by: Paul Kotz <paulk@smallstudio.com.au>