Fixed Seg Fault
Merge pull request #19 from Callum-/master

Fixed Seg Fault