Merge pull request #13 from doctorbatmangod/master

segfaults
Everything is done except the whole thing
Merge pull request #6 from zgao/master

EVERYTHING