Feature/add clip back

closes #5