First version.
Merge branch 'master' of github.com:papadop/medinria-superproject