Changed times to use am/pm. Fixes #11