removed garbage from merging..
Merge branch 'master' into scripting