Group interval

Merge this branch to Master