Issue #37 tweaking the breakpoints