Merge branch 'master' of github.com:lavende/ecclesia into lsn
fix
Merge branch 'lsn' of github.com:lavende/ecclesia