A little bit of documentation.
Merge branch 'dev'