merge fix
Merge branch 'master' of https://github.com/ldemarest/modernmind
merge fix
merge fix