Committing to transfer to desktop
Merge remote-tracking branch 'origin'