Jkarni/issues/14

Remove core dump