Seg faults be gone!

See #59 for more details

Merging immediately