Added description of workshop
merge in origin