Fixed am/pm bug

Closed #121