Fix for Issue #21

I rebased and added a possible fix for parsing times with ActiveSupport. Please review.