Merge pull request #17 from KevinW1998/master

Improvment to History
Small changes
Merge pull request #25 from Wohlstand/master

Merge to Update 25