final changes
Merge branch 'development' of https://github.com/eschleining/megal into development