made basic script work
Merge origin/master