updated to latest gems
support custom time format