Merge pull request #24 from echen027/master

checking for time