Merge pull request #13 from mweastwood/improvements

Define getTime and putTime!