moved Context to DataAndObjects
Merge branch 'master' of https://github.com/piantado/LOTlib
see commit msg