Improved Heap implementation
Merge branch 'heapRework'