Fixed so that time is saved
Merge pull request #9 from toftan/master

Merge pull request #5 from McF1st/master
Merge pull request #6 from McF1st/master

Get latest