Merge with latest developments from EHJ-52n

- Fixes #36
- Some refactoring
- Review of resources