[FIX] Small changes
Merge branch 'develop'