Merge pull request #5 from zgao/master

added args
SEGFAULTS
Merge pull request #13 from doctorbatmangod/master

segfaults