28
Merge branch 'master' of https://github.com/themagpimag/magpi-issue28

Almost there! - ready for testing again, and any comments.