Merge branch 'master' into Lucas-branch
Add update button and some code

see above
Merge branch 'Lucas-branch'