RC1 Project Curacaco part 4
Merge branch 'master' of https://github.com/themagpimag/magpi-issue21