rework code blocks
Merge branch 'develop'