~mika/sofa 

Add licensing + fix last memory mgmt issue

sofa sitting