setting version 2.1 for this branch scripts
updated todos and examples
merge with branch 2.1