Merge pull request #46 from twiniars/master

conveyor joint action
irp6otm addition
hi fix