Added script location variable
Fixed typo
Merge branch 'master' into visualization
Good lord I loathe the module system