Modified Project for Running on Device
Merge branch 'Running-on-Device'