Added history settings
Merge branch 'master' into archtop