Merge branch 'pr/2' into pr/3

Conflicts:
index.html