Added shake effect
Merge branch 'chris'