Merged latest changes from the computercraft forum