Pull in upstream changes from tapmodo

Pull in the latest master repo's upstream changes from `tapmodo`