Moving comments up higher
Merge branch 'develop'