Update to new version of framework
Merge pull request #2 from pfschwartz/develop

Update to new version of framework