Hpefull fixed segfault :(
Merge pull request #112 from RobertBColton/master

Fixed Segfault