fix issues
Merge pull request #11 from shopgirl284/historyfix

fix issues