Messing around with emulators and code suggestion
Merge remote-tracking branch 'origin/master'