First draft
Merge branch 'master' of github.com:GertG/Solidare-it