Merge branch 'master' into app
Merge branch 'app'
Update #243 by Henry: Update the master branch with the correct files