[History] Improve journal and journal entry
Merge pull request #10 from egeloen/history

[History] Improve journal and journal entry