Fixed #81
Merge pull request #84 from jmalloc/master

Fixed #81