fixed variables
Merge branch 'develop'