Merge pull request #351 from bastih/master

Fixes for recent cleanups
Default initialize PointerCalculator members to prevent segfaults
Default initialize member to prevent segfault when not properly initialized