removed focus try and add code sample support
Merge remote-tracking branch 'origin/master'