Updated C code to fix rare segfaults - #11

Updated C code to fix rare segfaults#11

ScottMastro wants to merge 3 commits into

vishnubob:mastervishnubob/ssw:masterfrom

ScottMastro:masterScottMastro/ssw:masterCopy head branch name to clipboard