Merge branch 'feature/smart-ptr'