fixed some bugs related to use strict
Merge branch 'master' into controls