Fixed changes
Merge branch 'danny'