Merge fork from roastnewt