Merge branch 'daniel/code-sample'