bugfix
Merge branch 'beta' of https://github.com/boring12345/Memory into beta