Commit 15/11 from Easynote
Commit from EasyNote ver. 27/11