solved some bugs with loading history
Merge branch 'development' into production