Add var keyword
Merge branch 'patch-2' into all-patch