Update of pick and place
Pick and place finished
Merge pull request #309 from reem-utils/cris_branch

Cris branch