Missed the ~/ 2 comment
Merge branch 'heap' into merge-heap