Added another version with support for custom joda datetime formatting
Merge branch 'development'