Merge pull request #225 from boaz001/patch-1

Move variable declaration to support old compiler