Fix SimpleDateFormatException
Add test
Fix Pattern
Fix NullPointerException
Merge pull request #24 from mymargaret/master

Fixes