declare size as a local variable
Merge remote-tracking branch 'mathisonian/patch-1' into dev