Fixing a bug
Merge branch 'Temporary' into Lawrence