Breakpoint support, needs PC highlighting yet.
Merge branch 'origin/master'