Added breakpoints
Merge branch 'feature/breakpoints'