First attempt at a summary line.
Merge branches 'master' and 'develop'