Initial commit
Merge https://github.com/michael-pr/Aldaris