Clarified a bit.
Merge branch 'develop'