Fixed global leak; Closes #15