Beth's amendments
Merge branch 'new_development' of github.com:domhacking/test_git into new_development