Setting foldmethod=marker
Merge branch 'develop'