Merge remote-tracking branch 'github/master'
adapt main.js to use 'real' data