merge changes from ZachBray/FunScript