Base arch
Little updates
Merge branch 'master' of github.com:delwiv/imie-amphi