added new contextRequirements support
fixes for bugs found during testing
Merge pull request #54 from daniellemayne/develop

Develop - fixed bugs found during testing