Minor additions.
Merge branch 'dev'