Code fixes
Merge branch 'master' of https://github.com/themagpimag/magpi-issue25