Fixed badly named variable,
Merge branch 'test' into dev