Bug fix
Merge branch 'master' of github.com:foadnh/public-diary