Merge pull request #29 from EHJ-52n/develop

Merge with latest developments from EHJ-52n