A fork of junalmeida's fork. Mirrored rather than forked so that other Github features work.