changes to support decimal intervals. Not finished
Merge remote-tracking branch 'origin/master'