Merge fr33jc's changes into creftos' fork.