Added Context functions
Merge branch 'develop' of github.com:dexset/DerelictNI into develop