Merge in @ne555's changes