Merge pull request #11 from DustInMonteriggioni/master

Why is merge between Victor and master so hard and the merge between Branch-chyb and master so easy...?!
Fix bug in HistoryList.putInItem()
Merge remote-tracking branch 'origin/master'