Add generic framework support
Merge pull request #6 from markdalgleish/generic-framework-support

Add generic framework support