COLLaborator part3 finish
Merge pull request #40 from JYYZrubik/master-for-93

COLLaborator part3 finish