Minor formating update
Merge branch 'development'

This merges the development and master branches.