Modify of maestros tutorial

Change-Id: I276ed59f1da360c23973bfc96751ccdee0e422af