New marker 'note'
Merge branch 'develop' of github.com:nilp0inter/geoffrey into develop