fixed segmentation fault
Merge branch 'master' of https://github.com/jonathanklingberg/EDA031