added paragraph
Merge branch 'bugs' into dev