First commit - 1st approch
Merge branch 'master' of https://github.com/dviedma/NuMa