Merge pull request #81 from daniellemayne/develop

Develop - added contextRequirements support and general bug fixes after testing