Time sort of working
Merge pull request #1 from hamchapman/master

Time sort of working