Fixed issue of passing variables to function (Hopefully)
Merge remote-tracking branch 'origin/master' into gh-pages