converting typeOf call to typeof
Merge branch 'master' into gh-pages