Hardcoded demo needs to be fixed eventually
Merge remote-tracking branch 'origin/master'