changed some variable names
Merge branch 'develop'