Fixed 12 hour formatting, closes #216