Missed two statics
Added Heap verification
Merge pull request #2 from Botje/dries

Results of a productive friday hacking session