added terminate() and date to time
Merge branch 'misc'