Files can be deleted from under us
Renamed a variable
Renamed a variable
Merge branch 'develop'