Merge pull request #1 from vmware-serengeti/master

Pull Ben's recent framework changes
Merge pull request #1 from hickeng/master

Pull Ben's recent framework changes 2