Merge in all changes from the harrysouthworth:master repo

This should help with merging in any modifications made in this branch, since I will have all changes made since the last time merged in harrysouthworth:master.