split up the horrible long line
Merge branch 'master' of github.com:FriedSock/Project-Alastair