fix design
Merge branch 'develop' of https://github.com/DonutWorks/Ari into develop