Merge pull request #6 from zgao/master

EVERYTHING
fixed memory
Merge pull request #14 from doctorbatmangod/master

fixed memory