New adds
Merge branch 'master' of https://github.com/shankarj/PyPlan
Push 12/18