Update to DarthTon's master