Made variable name more clear.
Merge remote-tracking branch 'Greg/development' into development