Add new features
Merge branch 'develop' of github.com:Timtroll/epp into develop