Some minor changes.
Merge branch 'develop'