accept floats too (1.2.business_hours.from_now)
Merge branch 'develop'