Fixed some issues with the framework.
Merge pull request #170 from ChrisGrant/master

Fixed some issues with the framework.