Squash of @alapolloni 's PR
Squash of @alapolloni 's PR

Fixes #100 and #102

rzyns/jrnl,Shir0kamii/jrnl,dzeban/jrnl,maebert/jrnl,nikvdp/jrnl,zdravi/jrnl,beni55/jrnl,cloudrave/jrnl-todos,MSylvia/jrnl,notbalanced/jrnl,philipsd6/jrnl,MinchinWeb/jrnl,flight16/jrnl