Fixes HEROES-GSFC/SAS#59
Merge pull request #70 from ayshih/master

Seg faults be gone!