Commented code
Merge branch 'dev' of https://github.com/simonjrp/ESCAPE into dev
Commented code and fixed some tests to work with new structure