added small warning for clarity
Merge branch 'develop'