To be reviewed by @DemoAdmin. Fixes#3

To be reviewed