Saved version from zim
Merge github.com:hhurricane/Diary