finally fix syntax blocks probably.
Merge branch 'develop'