Add technical note
Merge branch 'develop'