Fixed segmentation fault
Merge pull request #12 from CodebyteStudios/Cameron

Fixed segmentation fault