Working out bugs
Merge branch 'master' into wrapup_real