ready for merge, added history.txt