Attempted fix for warnings in framework.
Merge pull request #177 from ChrisGrant/master

Attempted fix for warnings in framework.