Updated history and merged #257