Update for new framework variables.
Merge pull request #7 from setowns1/bug

Update for new framework variables.