Merge pull request #25 from echen027/master

append pm and other small changes to getting time