Changed list comprehension on Darren's request for readability.
Merge branch 'beta' of github.com:darrenburns/TeamProject3 into beta