Merge pull request #25 from travishohl/master

Moves from Date to Time