Fix segmentation fault (core dumped) error
Merge pull request #2 from myorbit/master

Minor update concerning segfaults