Added interval class
Merge remote-tracking branch 'origin/carlos'