tackle issue #43
Merge remote-tracking branch '52n/newfeature-segmentation-fault-issue' into newfeature-segmentation-fault-issue