* fixed issue #41 second part
 * fix segfault
Revert " * fix segfault"

This reverts commit d2e685213fbc4016000898ec393ced3c25c04c6f.
 * real fix for segfault
 * fix error detection in loadWhole()
Merge branch 'master' into fix-41