maj style doc
Merge branch 'develop'