Refactoring
Merge branch 'master' of github.com:liam-m/SEPR-MQV-3