Feature/contain

closes #88 
closes #68