Modified make controller 2048
Merge branch 'rama' into develop