Merge pull request #42 from twiniars/master

hi changes
conveyor added to the system